From 2e83dbdb929d8a553ffd2f82404e8169d1fe4134 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 26 Feb 2008 14:46:57 +0000 Subject: [PATCH] ioemu: Do not sue xce_handle directly as a file descriptor. xce handles are not supposed to be used as file descriptors, but xc_evtchn_fd() be used. Signed-off-by: Samuel Thibault --- tools/ioemu/hw/xen_console.c | 2 +- tools/ioemu/hw/xenfb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ioemu/hw/xen_console.c b/tools/ioemu/hw/xen_console.c index 44f8bcca48..fbd33f07fc 100644 --- a/tools/ioemu/hw/xen_console.c +++ b/tools/ioemu/hw/xen_console.c @@ -381,7 +381,7 @@ static void xencons_startup(void *opaque) qemu_set_fd_handler2(xs_fileno(dom->xsh), NULL, NULL, NULL, NULL); fprintf(stderr, "Console: connected to guest frontend\n"); - if (qemu_set_fd_handler2(dom->xce_handle, NULL, xencons_ring_read, NULL, dom) < 0) + if (qemu_set_fd_handler2(xc_evtchn_fd(dom->xce_handle), NULL, xencons_ring_read, NULL, dom) < 0) return; qemu_chr_add_handlers(dom->chr, xencons_can_receive, xencons_receive, diff --git a/tools/ioemu/hw/xenfb.c b/tools/ioemu/hw/xenfb.c index 5418986178..ea4ea14db2 100644 --- a/tools/ioemu/hw/xenfb.c +++ b/tools/ioemu/hw/xenfb.c @@ -1160,7 +1160,7 @@ static int xenfb_register_console(struct xenfb *xenfb) { xenfb); dpy_resize(xenfb->ds, xenfb->width, xenfb->height); - if (qemu_set_fd_handler2(xenfb->evt_xch, NULL, xenfb_dispatch_channel, NULL, xenfb) < 0) + if (qemu_set_fd_handler2(xc_evtchn_fd(xenfb->evt_xch), NULL, xenfb_dispatch_channel, NULL, xenfb) < 0) return -1; if (qemu_set_fd_handler2(xs_fileno(xenfb->xsh), NULL, xenfb_dispatch_store, NULL, xenfb) < 0) return -1; -- 2.30.2